window: Move updates debugging to GtkWidget

Which has the necessary information.

diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 81f6fdd38cc05ec963186c204202ca423bc867b8..5b7943d7c0c774ecaeb2f71aa99722a9354cd487 100644 (file)
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -72,6 +72,7 @@
 #include "gtkrenderborderprivate.h"
 #include "gtkrenderbackgroundprivate.h"
 #include "gtkcssshadowsvalueprivate.h"
+#include "gtkdebugupdatesprivate.h"
 
 #include "inspector/window.h"
 
@@ -4913,6 +4914,7 @@ gtk_widget_real_queue_draw_region (GtkWidget            *widget,
                                   const cairo_region_t *region)
 {
   g_assert (_gtk_widget_get_has_window (widget));
+  gtk_debug_updates_add (widget, region);
   gdk_window_invalidate_region (_gtk_widget_get_window (widget), region, TRUE);
 }
 

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index a4b1591203b9100efba8d0fb9cfdabce4e2045ce..f5667205b377ac5b2f70697e4762c1d04646fd52 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -513,8 +513,6 @@ static void        gtk_window_do_popup         (GtkWindow      *window,
 static void gtk_window_style_updated (GtkWidget     *widget);
 static void gtk_window_state_flags_changed (GtkWidget     *widget,
                                             GtkStateFlags  previous_state);
-static void gtk_window_queue_draw_region (GtkWidget            *widget,
-                                         const cairo_region_t *region);
 
 static GSList      *toplevel_list = NULL;
 static guint        window_signals[LAST_SIGNAL] = { 0 };
@@ -827,7 +825,6 @@ gtk_window_class_init (GtkWindowClass *klass)
   widget_class->state_flags_changed = gtk_window_state_flags_changed;
   widget_class->style_updated = gtk_window_style_updated;
   widget_class->snapshot = gtk_window_snapshot;
-  widget_class->queue_draw_region = gtk_window_queue_draw_region;
   widget_class->pick = gtk_window_pick;
 
   container_class->add = gtk_window_add;
@@ -7826,15 +7823,6 @@ gtk_window_style_updated (GtkWidget *widget)
     update_themed_icon (GTK_WINDOW (widget));
 }
 
-static void
-gtk_window_queue_draw_region (GtkWidget            *widget,
-                             const cairo_region_t *region)
-{
-  gtk_debug_updates_add (widget, region);
-
-  GTK_WIDGET_CLASS (gtk_window_parent_class)->queue_draw_region (widget, region);
-}
-
 /**
  * _gtk_window_unset_focus_and_default:
  * @window: a #GtkWindow